OSDN Git Service
Wale Ogunwale [Fri, 23 Oct 2015 19:30:28 +0000 (12:30 -0700)]
Updated support for drawing background drawable when resizing
f3a62fbc58bbc7f081a53248cae48a8951294e8f added support for drawing
the background draweable when resizing an activity window.
However, after some additional discussion we decided that
R.styleable.Window_windowResizingBackground and
R.integer.config_windowResizingBackgroundColorARGB are not needed.
We use R.styleable.Window_windowBackground for the background
drawable and fallback to using R.styleable.Window_windowBackgroundFallback
which is now public if the first isn't set.
Bug:
24534744
Change-Id: Ia0507e25a1893ea941d259f1d4e88ce500dda154
Steve McKay [Fri, 23 Oct 2015 15:33:03 +0000 (15:33 +0000)]
Merge "Revert "Treat UNKNOWN tooltype events as Mouse events.""
Clara Bayarri [Fri, 23 Oct 2015 15:20:56 +0000 (15:20 +0000)]
Merge "Fix crash in KeyboardView with null Handler"
John Reck [Fri, 23 Oct 2015 15:19:47 +0000 (15:19 +0000)]
Merge "Add ShadowBench"
Tom Hudson [Fri, 23 Oct 2015 14:17:11 +0000 (14:17 +0000)]
Merge "Remove direct dependency of external/skia on frameworks/native"
Tom Hudson [Thu, 15 Oct 2015 20:41:55 +0000 (16:41 -0400)]
Remove direct dependency of external/skia on frameworks/native
Moves all code that needs to link with libgui or libui into
frameworks/native/hwui/utils/TestWindowContext. This allows us to
run Skia automated tests against a HWUI backend to watch for
performance or correctness regressions on Android.
BUG=
23556017
TEST=After this change, we can remove libui and frameworks/native/include
from external/skia/Android.mk
R=djsollen@google.com
Change-Id: I6f02a5ff98101e448606a1e892686e2c648b6c8a
Clara Bayarri [Fri, 23 Oct 2015 12:22:14 +0000 (13:22 +0100)]
Fix crash in KeyboardView with null Handler
A recent change in how the handler is created in KeyboardView
caused the password change flow to crash in ChooseLockPassword.
Change-Id: Id5fcb256f9a09b75bf91c5c79614d8abfc29747f
Andreas Gampe [Fri, 23 Oct 2015 04:30:35 +0000 (04:30 +0000)]
Merge "Revert "libs: add libpackagelistparser"" am:
e3da6ba5dd am:
314e1e00d8
am:
b61fd4fae2
* commit '
b61fd4fae2cefc441a75f7b695e671e84570006f':
Revert "libs: add libpackagelistparser"
Andreas Gampe [Fri, 23 Oct 2015 04:24:05 +0000 (04:24 +0000)]
Merge "Revert "libs: add libpackagelistparser"" am:
e3da6ba5dd
am:
314e1e00d8
* commit '
314e1e00d812e4edf426a46726a2127c563048a5':
Revert "libs: add libpackagelistparser"
Andreas Gampe [Fri, 23 Oct 2015 04:16:20 +0000 (04:16 +0000)]
Merge "Revert "libs: add libpackagelistparser""
am:
e3da6ba5dd
* commit '
e3da6ba5dd29002789a76dafdc14987c51d92ea5':
Revert "libs: add libpackagelistparser"
Andreas Gampe [Fri, 23 Oct 2015 03:46:40 +0000 (03:46 +0000)]
Merge "Revert "libs: add libpackagelistparser""
Sungmin Choi [Fri, 23 Oct 2015 03:44:29 +0000 (03:44 +0000)]
Remove tether_apndata for Sasktel am:
a665ea7207 am:
af745653d0 am:
b932dc5253
am:
9bd6b23111
* commit '
9bd6b231115ed273dd3eeed90a1f83f494a1ba72':
Remove tether_apndata for Sasktel
Sungmin Choi [Fri, 23 Oct 2015 03:38:20 +0000 (03:38 +0000)]
Remove tether_apndata for Sasktel am:
a665ea7207 am:
af745653d0
am:
b932dc5253
* commit '
b932dc5253fa27ec54e7aeeba12307adb3965df3':
Remove tether_apndata for Sasktel
Sungmin Choi [Fri, 23 Oct 2015 03:33:29 +0000 (03:33 +0000)]
Remove tether_apndata for Sasktel am:
a665ea7207
am:
af745653d0
* commit '
af745653d0809d7f9545cebf8727ea8c75990fd1':
Remove tether_apndata for Sasktel
Sungmin Choi [Fri, 23 Oct 2015 03:26:18 +0000 (03:26 +0000)]
Remove tether_apndata for Sasktel
am:
a665ea7207
* commit '
a665ea72075dbaa5a86f866ee6c8df5a80f1ced3':
Remove tether_apndata for Sasktel
Andreas Gampe [Fri, 23 Oct 2015 02:49:29 +0000 (19:49 -0700)]
Revert "libs: add libpackagelistparser"
This reverts commit
dc06bb0752c1bc3e87b04a097b308bca1bc86181.
This should go into system/core.
Change-Id: Idf304ac5ccd4bcc86722f65688e3ee6284452287
Roozbeh Pournader [Fri, 23 Oct 2015 01:39:28 +0000 (01:39 +0000)]
Merge "Pass the whole locale list down to Minikin."
John Reck [Fri, 23 Oct 2015 00:07:45 +0000 (17:07 -0700)]
Add ShadowBench
Drop -O3 & -ffast-math as they don't
help on clang and just hit SIGBUS issues
Change-Id: I8e9a8f4cd9ddf136103a6b7f69902e9f3a730c57
Sungmin Choi [Fri, 16 Oct 2015 21:39:22 +0000 (14:39 -0700)]
Remove tether_apndata for Sasktel
Device has second APN (inet.stm.sk.ca) is being used for hot spot/tethered data.
SaskTel has moved to a single APN on devices (pda.stm.sk.ca).
BUG=
25064017
Change-Id: I5ba1f9e7c3b54cf8e8681a289693aba0ac584296
Daniel Cashman [Thu, 22 Oct 2015 23:47:40 +0000 (23:47 +0000)]
Merge "libs: add libpackagelistparser" am:
cc7373eafd am:
188e8875db
am:
a2dbc1cea3
* commit '
a2dbc1cea3c60510f27bfeb39012ae2c2796503c':
libs: add libpackagelistparser
Daniel Cashman [Thu, 22 Oct 2015 23:38:40 +0000 (23:38 +0000)]
Merge "libs: add libpackagelistparser" am:
cc7373eafd
am:
188e8875db
* commit '
188e8875db1a55a6bafc8e8ef741400baab6e6fb':
libs: add libpackagelistparser
Jason Monk [Thu, 22 Oct 2015 23:26:32 +0000 (23:26 +0000)]
Merge "Add way to add to prototype QS editing"
Daniel Cashman [Thu, 22 Oct 2015 23:12:49 +0000 (23:12 +0000)]
Merge "libs: add libpackagelistparser"
am:
cc7373eafd
* commit '
cc7373eafd0d5be7df8898748a700b47298ebf10':
libs: add libpackagelistparser
Maxim Bogatov [Thu, 22 Oct 2015 23:09:20 +0000 (23:09 +0000)]
Merge "Prevent AccessibilityInteractionClient.getWindows() returns partially cached windows list."
Daniel Cashman [Thu, 22 Oct 2015 23:03:51 +0000 (23:03 +0000)]
Merge "libs: add libpackagelistparser"
Ian Pedowitz [Thu, 22 Oct 2015 22:53:24 +0000 (22:53 +0000)]
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am:
09fd4ecf90 am:
b402735fc0 am:
07129d53b5
am:
d3511518f9
* commit '
d3511518f927eead41fb33c56803104672dcffc2':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:46:06 +0000 (22:46 +0000)]
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am:
09fd4ecf90 am:
b402735fc0
am:
07129d53b5
* commit '
07129d53b5380ec556fa14c7506a26b6776e629a':
Revert "Track ashmem memory usage in Parcel"
Hui Shu [Thu, 22 Oct 2015 22:41:31 +0000 (22:41 +0000)]
Merge "Add the APIs for customizing WebView action mode menu actions"
Ian Pedowitz [Thu, 22 Oct 2015 22:38:56 +0000 (22:38 +0000)]
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am:
09fd4ecf90
am:
b402735fc0
* commit '
b402735fc0eb246233814bce76118fba99bb9f87':
Revert "Track ashmem memory usage in Parcel"
Hui Shu [Thu, 22 Oct 2015 21:57:51 +0000 (14:57 -0700)]
Add the APIs for customizing WebView action mode menu actions
We will allow apps to disable Share, Web Search, and text
processing related menu actions.
The default actions like cut, copy, paste cannot be disabled.
BUG:
22772178
Change-Id: I8429454f71f74a99298f412862cd32d8fba93784
Ian Pedowitz [Thu, 22 Oct 2015 22:32:37 +0000 (22:32 +0000)]
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
am:
09fd4ecf90
* commit '
09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
Revert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:26:32 +0000 (22:26 +0000)]
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
Ian Pedowitz [Thu, 22 Oct 2015 22:08:07 +0000 (22:08 +0000)]
Revert "Track ashmem memory usage in Parcel"
This reverts commit
ab3f9724035046d65124a72db2a09c824b3d5c67.
Bug:
25169267
Bug:
25191602
Bug:
25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
Winson Chung [Thu, 22 Oct 2015 21:26:18 +0000 (21:26 +0000)]
Merge "Additional refactoring interface between component and activity."
Steve McKay [Thu, 22 Oct 2015 20:57:50 +0000 (13:57 -0700)]
Revert "Treat UNKNOWN tooltype events as Mouse events."
https://buganizer.corp.google.com/u/0/issues/
24904588 has been fixed.
This reverts commit
260c6980cef923792c352dc8143be5cb93a3af55.
Change-Id: I341513c06a7bfda364b0efd675e785ce766d5819
Nicolas Prévot [Thu, 22 Oct 2015 20:56:19 +0000 (20:56 +0000)]
Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev am:
6666b29cf7 am:
f31628f58b am:
d7688f5933
am:
e1be56cdff
* commit '
e1be56cdfff431985ffd931bdd7c001e4c87478d':
Don't resolve cross-profile app links without intent picker.
Nicolas Prévot [Thu, 22 Oct 2015 20:49:46 +0000 (20:49 +0000)]
Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev am:
6666b29cf7 am:
f31628f58b
am:
d7688f5933
* commit '
d7688f593327929e2bc42989236b62ddecf5e8b5':
Don't resolve cross-profile app links without intent picker.
Nicolas Prévot [Thu, 22 Oct 2015 20:43:32 +0000 (20:43 +0000)]
Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev am:
6666b29cf7
am:
f31628f58b
* commit '
f31628f58b97f99133b760b4c34d2ff6f4e456d0':
Don't resolve cross-profile app links without intent picker.
Nicolas Prévot [Thu, 22 Oct 2015 20:35:19 +0000 (20:35 +0000)]
Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev
am:
6666b29cf7
* commit '
6666b29cf7c5ddaeae3d66606a9982f7c5cc8686':
Don't resolve cross-profile app links without intent picker.
Adam Lesinski [Thu, 22 Oct 2015 20:34:36 +0000 (20:34 +0000)]
Merge "AAPT2: Process <java-symbols> and private symbol package"
Tenghui Zhu [Thu, 22 Oct 2015 20:33:06 +0000 (20:33 +0000)]
Merge "Fix segment number for arcTo conversion"
Nicolas Prévot [Thu, 22 Oct 2015 20:29:51 +0000 (20:29 +0000)]
Merge "Don't resolve cross-profile app links without intent picker." into mnc-dr-dev
John Reck [Thu, 22 Oct 2015 20:27:36 +0000 (20:27 +0000)]
Merge "Add assert for required EGL extensions"
John Reck [Thu, 22 Oct 2015 20:11:00 +0000 (13:11 -0700)]
Add assert for required EGL extensions
Bug:
25149700
Change-Id: I535ead7c1f8ba8766dff85fcf26a9cfe76647fb8
Roozbeh Pournader [Mon, 19 Oct 2015 23:56:39 +0000 (16:56 -0700)]
Pass the whole locale list down to Minikin.
Also, compute LocaleList's string representation at construction.
This is to further push the cost of doing costly operations related
to LocaleLists to construction time.
Change-Id: Ia55b8ce66b1088ff54cb42eb1e11149b5bd10f17
Adam Lesinski [Fri, 16 Oct 2015 21:37:48 +0000 (14:37 -0700)]
AAPT2: Process <java-symbols> and private symbol package
Need to introduce the idea of multiple levels of visibility to support <java-symbol>.
Public, Private, Undefined.
Public means it is accessible from outside and requires an ID assigned.
Private means that we explicitly want this to be a symbol (show up in R.java), but not visible
to other packages. No ID required.
Undefined is any normal resource. When --private-symbols is specified in the link phase,
these resources will not show up in R.java.
Change-Id: Icba89221e08e685dee7683786aa7112baf28c856
Winson [Tue, 20 Oct 2015 23:57:57 +0000 (16:57 -0700)]
Additional refactoring interface between component and activity.
- Removing broadcasts for communicating with the Recents activity from
the component in favor of using events.
Change-Id: I2ddfde911bd1fd1b2d63bb84a0e7f0338f955df6
Winson Chung [Thu, 22 Oct 2015 19:27:35 +0000 (19:27 +0000)]
Merge "Refactoring secondary user recents logic."
Winson [Tue, 20 Oct 2015 21:57:24 +0000 (14:57 -0700)]
Refactoring secondary user recents logic.
- Removing old broadcasts in favor of direct aidl interface between
system and secondary users. Also moving user specific implementation
into RecentsImpl, allowing Recents to handle proxying between users.
Change-Id: I4bd5ef1d1ee47309b7c754f50a5e8b2e2aab988f
Dmitry Torokhov [Thu, 22 Oct 2015 18:30:56 +0000 (18:30 +0000)]
SystemUI: fix automatic pairing of BT keyboards am:
79f00cf06f am:
d3eee7c410 am:
5c6a3872cb
am:
3eba93f21c
* commit '
3eba93f21c6cd7f3659e9c683c67cb3c19895677':
SystemUI: fix automatic pairing of BT keyboards
Dmitry Torokhov [Thu, 22 Oct 2015 18:24:35 +0000 (18:24 +0000)]
SystemUI: fix automatic pairing of BT keyboards am:
79f00cf06f am:
d3eee7c410
am:
5c6a3872cb
* commit '
5c6a3872cb0df50e9a8d2aaa0b8f84e78cd4433f':
SystemUI: fix automatic pairing of BT keyboards
Dmitry Torokhov [Thu, 22 Oct 2015 18:18:46 +0000 (18:18 +0000)]
SystemUI: fix automatic pairing of BT keyboards am:
79f00cf06f
am:
d3eee7c410
* commit '
d3eee7c410dbc6f8eb5133a347fb0a0ce7221893':
SystemUI: fix automatic pairing of BT keyboards
Dmitry Torokhov [Thu, 22 Oct 2015 18:13:36 +0000 (18:13 +0000)]
SystemUI: fix automatic pairing of BT keyboards
am:
79f00cf06f
* commit '
79f00cf06f5e70047d73b48d20910b967353b075':
SystemUI: fix automatic pairing of BT keyboards
Michael Wright [Thu, 22 Oct 2015 17:54:31 +0000 (17:54 +0000)]
Merge "Fixup InputManager javadoc"
Michael Wright [Thu, 22 Oct 2015 17:53:43 +0000 (17:53 +0000)]
Merge "Add kernel keycode mapping for new cut / copy / paste keys"
Anthony Hugh [Thu, 22 Oct 2015 17:42:07 +0000 (17:42 +0000)]
Merge "Give watch Home app location permissions by default" into cw-e-dev am:
0a3270e00a am:
5f8ac21cac
am:
a7882195a9
* commit '
a7882195a9888b2003c95d34a2d0aa5c53f61b62':
Give watch Home app location permissions by default
Anthony Hugh [Thu, 22 Oct 2015 17:36:23 +0000 (17:36 +0000)]
Merge "Give watch Home app location permissions by default" into cw-e-dev am:
0a3270e00a
am:
5f8ac21cac
* commit '
5f8ac21cac89077edd50d547b43550296a506d4b':
Give watch Home app location permissions by default
Anthony Hugh [Thu, 22 Oct 2015 17:30:05 +0000 (17:30 +0000)]
Merge "Give watch Home app location permissions by default" into cw-e-dev
am:
0a3270e00a
* commit '
0a3270e00ab6bbba5669288f958cc88c8484a587':
Give watch Home app location permissions by default
Anthony Hugh [Thu, 22 Oct 2015 17:22:21 +0000 (17:22 +0000)]
Merge "Give watch Home app location permissions by default" into cw-e-dev
Dmitry Torokhov [Thu, 22 Oct 2015 17:07:53 +0000 (10:07 -0700)]
SystemUI: fix automatic pairing of BT keyboards
After reset (docking) Pixel C Keyboard that was previously paired with
a device goes into so-called non-discoverable mode, where it will
establish connection only with device that it has connected before. When
scanning for available devices we need to wait till the keyboard starts
advertising itself as discoverable, and only then try to pair.
Also, let's flush the device cache when we attach the base to make sure
the device that we seen before and cached again in the right state after
reset.
Bug:
24915541
Change-Id: I136c1c4235080a25529b4b1c2b1da9bc18508811
Chris Craik [Thu, 22 Oct 2015 17:16:55 +0000 (17:16 +0000)]
Merge "Work to support saveLayer in new pipeline"
Nicolas Prevot [Thu, 22 Oct 2015 13:55:26 +0000 (14:55 +0100)]
Don't resolve cross-profile app links without intent picker.
If ALLOW_CROSS_PROFILE_APP_LINKING has been set:
If there is an app with status always across profiles, and some
apps without status always in the current profile: show an intent
picker instead of directly resolving across profiles.
BUG:
25109215
Change-Id: I74a67d231284ce912121ea0818109fbf904183e8
John Reck [Thu, 22 Oct 2015 17:05:37 +0000 (17:05 +0000)]
Merge "Remove obsolete debug option"
John Reck [Thu, 22 Oct 2015 16:53:26 +0000 (09:53 -0700)]
Remove obsolete debug option
Bug:
25149700
Change-Id: I9280e2414255fb01e672094cd8d173efadac1681
Steve McKay [Thu, 22 Oct 2015 16:46:26 +0000 (16:46 +0000)]
Merge "Don't try to delete files twice."
Steve McKay [Wed, 21 Oct 2015 21:38:54 +0000 (14:38 -0700)]
Don't try to delete files twice.
Also, apply delete in reverse order to placate RecyclerView.
TODO: Refactor this whole stack...needs some love.
Bug:
25091323,
24749296
Change-Id: I84e21c16423048bd50cd988eb1e2a36dc62b9d16
Michael Wright [Thu, 22 Oct 2015 16:23:12 +0000 (17:23 +0100)]
Fixup InputManager javadoc
Change-Id: I708b62db4861c7d391258b980a2447e08ed0d89e
Alan Viverette [Thu, 22 Oct 2015 15:02:32 +0000 (15:02 +0000)]
Merge "Reset constant width/height when DrawableContainer density changes"
Alan Viverette [Thu, 22 Oct 2015 15:02:01 +0000 (15:02 +0000)]
Merge "Scale density correctly on VectorDrawable.applyTheme()"
Michael Wright [Thu, 22 Oct 2015 14:54:02 +0000 (15:54 +0100)]
Add kernel keycode mapping for new cut / copy / paste keys
Bug:
25120948
Change-Id: I33a93fa6c067d15a9739ca33703e0e48e8cf6eff
Michael Wright [Thu, 22 Oct 2015 14:47:33 +0000 (14:47 +0000)]
Merge "Add new Cut / Copy / Paste keys."
Esteban Talavera [Thu, 22 Oct 2015 10:27:10 +0000 (10:27 +0000)]
Merge "Only system can set app restrictions"
Yoshiki Iguchi [Thu, 22 Oct 2015 07:53:41 +0000 (07:53 +0000)]
Fix crash on calling removeSelection with showing selection handlers am:
9582e15196 am:
6649ee972b am:
6a5bb1534c
am:
fb8343549a
* commit '
fb8343549a65bf65dab0fce6830b1b39ce62ddaa':
Fix crash on calling removeSelection with showing selection handlers
Yoshiki Iguchi [Thu, 22 Oct 2015 07:49:00 +0000 (07:49 +0000)]
Fix crash on calling removeSelection with showing selection handlers am:
9582e15196 am:
6649ee972b
am:
6a5bb1534c
* commit '
6a5bb1534c736c21260c5c488ff58e4d81972f92':
Fix crash on calling removeSelection with showing selection handlers
Yoshiki Iguchi [Thu, 22 Oct 2015 07:44:15 +0000 (07:44 +0000)]
Fix crash on calling removeSelection with showing selection handlers am:
9582e15196
am:
6649ee972b
* commit '
6649ee972b2bfbeca2d664cfd6629810ebbc7ac8':
Fix crash on calling removeSelection with showing selection handlers
Yoshiki Iguchi [Thu, 22 Oct 2015 07:39:17 +0000 (07:39 +0000)]
Fix crash on calling removeSelection with showing selection handlers
am:
9582e15196
* commit '
9582e151964be60457d4abd712857fb1e8a4586d':
Fix crash on calling removeSelection with showing selection handlers
Yoshiki Iguchi [Thu, 15 Oct 2015 04:34:41 +0000 (13:34 +0900)]
Fix crash on calling removeSelection with showing selection handlers
A crash occured on updating after calling removeSelection with showing
selection handlers. This was because some selection-handler code didn't
consider the case the selection index was -1 (-1 means there is no selection).
This patch fixes this crash.
Bug:
23299977
Change-Id: I736d315e073f773aec597522203015205a8da42b
Lorenzo Colitti [Thu, 22 Oct 2015 06:33:09 +0000 (06:33 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am:
809dcade99 am:
bdc458048a am:
bb8f652372
am:
8ecad265b6
* commit '
8ecad265b6db57f78dd142e974057c91f69489ed':
Reinstate CHANGE_NETWORK_STATE as a normal permission.
Lorenzo Colitti [Thu, 22 Oct 2015 06:28:24 +0000 (06:28 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am:
809dcade99 am:
bdc458048a
am:
bb8f652372
* commit '
bb8f652372f261edd2083103d4300a9173993706':
Reinstate CHANGE_NETWORK_STATE as a normal permission.
Lorenzo Colitti [Thu, 22 Oct 2015 06:23:23 +0000 (06:23 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am:
809dcade99
am:
bdc458048a
* commit '
bdc458048abee78a945a26cd13a71245e7d4a2e5':
Reinstate CHANGE_NETWORK_STATE as a normal permission.
Lorenzo Colitti [Thu, 22 Oct 2015 06:18:43 +0000 (06:18 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
am:
809dcade99
* commit '
809dcade9906001f6aa51a68aa783e20bb1d7c0d':
Reinstate CHANGE_NETWORK_STATE as a normal permission.
Lorenzo Colitti [Thu, 22 Oct 2015 06:15:05 +0000 (06:15 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
Nathan Harold [Thu, 22 Oct 2015 05:39:02 +0000 (05:39 +0000)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am:
0dccd12800 am:
64e8bdc476 am:
51692ac260
am:
6f39642389
* commit '
6f39642389d2702125898c401ca9e8881a322fe0':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 05:33:10 +0000 (05:33 +0000)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am:
0dccd12800 am:
64e8bdc476
am:
51692ac260
* commit '
51692ac260f8acc405ba94e9e83294bb1ef20015':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 05:28:26 +0000 (05:28 +0000)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am:
0dccd12800
am:
64e8bdc476
* commit '
64e8bdc4760aebf7f8c80ce3384120ed9b01a3ec':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 05:23:34 +0000 (05:23 +0000)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
am:
0dccd12800
* commit '
0dccd128001ceff9437f736bd70dfd1986e315d5':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 03:12:10 +0000 (20:12 -0700)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
-Fixed doc string
Bug:
23979591
This reverts commit
f7b6474de87fd2eee377dc612c757102cdacc003.
Change-Id: I127f1452f4319a154dd4d962d4a63c84f0833702
Nathan Harold [Thu, 22 Oct 2015 03:13:02 +0000 (03:13 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am:
42015c4081 am:
5be7dbc88d am:
b129c106bd
am:
ce73642a58
* commit '
ce73642a5804a50468fa9bc928333653948c5549':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Nathan Harold [Thu, 22 Oct 2015 03:07:57 +0000 (03:07 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am:
42015c4081 am:
5be7dbc88d
am:
b129c106bd
* commit '
b129c106bde86b8b290cc25cc39f0fcb9b9b48fb':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Nathan Harold [Thu, 22 Oct 2015 03:03:18 +0000 (03:03 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am:
42015c4081
am:
5be7dbc88d
* commit '
5be7dbc88d0460dfede5373f1204f4645ce99726':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Nathan Harold [Thu, 22 Oct 2015 02:58:15 +0000 (02:58 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev
am:
42015c4081
* commit '
42015c4081f9d37d579f0be15e11725cf6cc5fba':
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Nathan Harold [Thu, 22 Oct 2015 02:54:45 +0000 (02:54 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev
Nathan Harold [Thu, 22 Oct 2015 02:53:57 +0000 (02:53 +0000)]
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
This reverts commit
5d1429e0dd1a13f76dbb354f9e4e415f71956299.
Doc string isn't resolving. Temporarily reverting.
Change-Id: I128b13abcf938c96b24225e373ac0885c24e083e
Daichi Hirono [Thu, 22 Oct 2015 02:23:39 +0000 (02:23 +0000)]
Merge "Support major format code in MtpDocumentsProvider."
Nathan Harold [Thu, 22 Oct 2015 02:18:46 +0000 (02:18 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am:
f8a4dc4a6f am:
dc9f8fab0f am:
1a3c88a5bf
am:
c3a94cb6c2
* commit '
c3a94cb6c2097ae2b30500a32ecf95b5714bd8c2':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 02:13:54 +0000 (02:13 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am:
f8a4dc4a6f am:
dc9f8fab0f
am:
1a3c88a5bf
* commit '
1a3c88a5bf8c80d46958830bb6282463c72a4e6b':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 02:08:56 +0000 (02:08 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am:
f8a4dc4a6f
am:
dc9f8fab0f
* commit '
dc9f8fab0fd9485b22651fe5c7f70961d67d697a':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 02:03:32 +0000 (02:03 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev
am:
f8a4dc4a6f
* commit '
f8a4dc4a6f8383fc2999ce1292d900912a0da842':
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 01:58:37 +0000 (01:58 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev
Chris Craik [Tue, 20 Oct 2015 16:39:42 +0000 (09:39 -0700)]
Work to support saveLayer in new pipeline
clipped SaveLayers will now be pulled to the beginning of the frame,
prior to drawing FBO 0. This will remove the need for switching FBOs
mid-frame.
Change-Id: I4d8dc1f845e84e9b49d5acdf4f4703eef4a9cb06