drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
307,954 Commits 1 Branch 0 Tags
Commit Graph

307954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Leme
5310093e62 Merge "Pass FillResponse extra back to onSaveRequest(...)." 2017-02-16 17:31:47 +00:00
Narayan Kamath
0c77d181f3 Merge "Track libcore change d7d594236d66c4d595f7622a264fd51." am: 97ebc29e9c am: b872486722 
am: 26e655f397

Change-Id: I85b862ddf9f0e1b5dc48197075616bebdabf8c1a
 2017-02-16 17:31:41 +00:00
TreeHugger Robot
15c4454970 Merge "Allow setImeWindowStatus with null startInputToken" 2017-02-16 17:29:36 +00:00
Nick Kralevich
d0a2d5edea Merge "system_server: add CAP_SYS_PTRACE" 2017-02-16 17:24:43 +00:00
Narayan Kamath
26e655f397 Merge "Track libcore change d7d594236d66c4d595f7622a264fd51." am: 97ebc29e9c 
am: b872486722

Change-Id: Ia7111f2be312494fbdb816efae9a7b465ce6b1a4
 2017-02-16 17:24:40 +00:00
Narayan Kamath
b872486722 Merge "Track libcore change d7d594236d66c4d595f7622a264fd51." 
am: 97ebc29e9c

Change-Id: Ied575c14661753a56241f0cea62391b057ab4316
 2017-02-16 17:20:26 +00:00
Narayan Kamath
97ebc29e9c Merge "Track libcore change d7d594236d66c4d595f7622a264fd51." 2017-02-16 17:12:48 +00:00
Shreyas Basarge
ddc72dd32e Merge "Better iteration over mCurrentOperations in cancelBackups" 2017-02-16 16:43:00 +00:00
Winson Chung
ba422045d7 Merge "Reducing number of configuration changes during PiP transition." 2017-02-16 16:40:01 +00:00
Marco Nelissen
fb6df0b969 Make audio effects work 
This makes the built-in audio effects work again.
3rd party effect panels can be made to work by disabling the built-in one
in Settings.
TODO: implement selection mechanism for third party effect panels.

Bug: 35316970
Test: manual
Change-Id: I6cd1cfba909bf74c31f37e9ecedcb28046f9109b
 2017-02-16 08:34:05 -08:00
Neil Fuller
04c959a3d0 Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller" am: eb82e3de87 am: c1867dedfa am: 4f5f211f72 
am: 03b89cdfb3

Change-Id: I831b29b0da995aca9c6e16d328f49d7771dd10db
 2017-02-16 16:20:41 +00:00
Neil Fuller
03b89cdfb3 Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller" am: eb82e3de87 am: c1867dedfa 
am: 4f5f211f72

Change-Id: If08545341c1bdcd79b7b16ed1da0f16b924cdea0
 2017-02-16 16:14:00 +00:00
Neil Fuller
4f5f211f72 Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller" am: eb82e3de87 
am: c1867dedfa

Change-Id: If2f639d07a44861b96b4497cc3dc02364dc85c51
 2017-02-16 16:09:10 +00:00
Felipe Leme
387f45d78f Merge "Add URL on ViewStructure." 2017-02-16 16:04:22 +00:00
Neil Fuller
c1867dedfa Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller" 
am: eb82e3de87

Change-Id: I7666ae9c9472f11cafe0df5a2f259df1c499d44b
 2017-02-16 16:02:33 +00:00
Bill Yi
eb7e2276fc Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: d663b483d1 -s ours 
am: 7ab32a6a1f  -s ours

Change-Id: Idfa9d92b40fed386369d648a11d7f39695e3ba9a
 2017-02-16 15:53:37 +00:00
Neil Fuller
eb82e3de87 Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller" 2017-02-16 15:51:27 +00:00
Bill Yi
7ab32a6a1f Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: d663b483d1  -s ours

Change-Id: I2ca0a1321763042be06e780dd89902810769ee3e
 2017-02-16 15:46:11 +00:00
Bill Yi
89adc92338 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c527941449 -s ours 
am: 51df670652  -s ours

Change-Id: I472ecff59c06ee733f639c292e8d44439678b4d2
 2017-02-16 15:44:12 +00:00
Bill Yi
9952a4f23c Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: aeab162647 -s ours 
am: 12adaa125e  -s ours

Change-Id: If3096bf1b094c844ce00992ce9e464b01e8eb47b
 2017-02-16 15:43:05 +00:00
Bill Yi
90bfda50bd Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 495542837c -s ours 
am: 293322635c  -s ours

Change-Id: I9f01df2ba8ffb458d56b991719a40ad5cb9f9f39
 2017-02-16 15:40:14 +00:00
Bill Yi
3e86438ee9 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: ea62e92c27 -s ours 
am: 2b8164620f  -s ours

Change-Id: I14e677d8e0ebe7a4dd11885698154ea130df701c
 2017-02-16 15:39:10 +00:00
Bill Yi
c75969805a Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 0860f41afc -s ours 
am: 1d8f1bd0b2  -s ours

Change-Id: Ifbb72d371976b1dd1699a84afb318f1420caa0a8
 2017-02-16 15:38:05 +00:00
Bill Yi
51df670652 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: c527941449  -s ours

Change-Id: Icf5989d2e0cd7dc95fab6507067520a961b08be7
 2017-02-16 15:38:04 +00:00
TreeHugger Robot
d663b483d1 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-16 15:37:17 +00:00
Bill Yi
12adaa125e Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: aeab162647  -s ours

Change-Id: Idb3a2c8387b8faac48c0d63d1f6c2fa84b1fb73e
 2017-02-16 15:36:59 +00:00
Bill Yi
293322635c Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: 495542837c  -s ours

Change-Id: I35a3f583390c5a03682680921cc593e48fb77f88
 2017-02-16 15:33:36 +00:00
Bill Yi
2b8164620f Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: ea62e92c27  -s ours

Change-Id: I0cde2e97d2d4ed8659b06ecae96c57a32f501e09
 2017-02-16 15:32:32 +00:00
Bill Yi
1d8f1bd0b2 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: 0860f41afc  -s ours

Change-Id: I6df27fbf95cc22ef8988730a1d7f244949fa838c
 2017-02-16 15:31:22 +00:00
TreeHugger Robot
c527941449 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-16 15:29:39 +00:00
TreeHugger Robot
aeab162647 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-16 15:29:09 +00:00
TreeHugger Robot
495542837c Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-16 15:25:34 +00:00
TreeHugger Robot
ea62e92c27 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-16 15:25:03 +00:00
TreeHugger Robot
0860f41afc Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-16 15:24:31 +00:00
TreeHugger Robot
78e1375a67 Merge "Moved bugreport intents to the com.android.internal namespace." 2017-02-16 15:16:26 +00:00
Shreyas Basarge
2d096ee435 Fix NPE in BackupManagerService 
If none of the requested packages are valid packages,
we'd run into this issue where PerformBackupTask#mQueue
is null but we try to iterate over it in finalizeBackup()
Fix is to use an empty queue as the default value instead
of null.

Bug: 35380067
Test: Manually tested by trying to backup a non-existent package.
Change-Id: Ibb2d03d5f8270bcb448ee083ee02964236aca92b
 2017-02-16 14:54:47 +00:00
Etan Cohen
c454a74514 Merge changes from topic 'cm_request_to' am: 6fb97e8fd8 am: ede9f94e32 am: c3f0f5f3de 
am: fcc8afcc7d

Change-Id: I2cef23ff183428041273007cf9bb1b655f92372a
 2017-02-16 14:46:52 +00:00
Etan Cohen
1e1c5b8cb8 [CM] Remove non-functional timeout from request network am: e9aea9d397 am: a6be89aa40 am: aae1411a93 
am: e74978c047

Change-Id: I183dfdb5e8193051424fa5fb5c4f5ad6d4d0c741
 2017-02-16 14:45:42 +00:00
Etan Cohen
fcc8afcc7d Merge changes from topic 'cm_request_to' am: 6fb97e8fd8 am: ede9f94e32 
am: c3f0f5f3de

Change-Id: Ief32189b0f6f2c70d7e4097f70dbdf8195bd8713
 2017-02-16 14:38:28 +00:00
Narayan Kamath
03d82b2ea3 Track libcore change d7d594236d66c4d595f7622a264fd51. 
Test: make update-api docs
Change-Id: Icfe470034b53afff60469d5bcfd58d959cea2488
 2017-02-16 14:37:39 +00:00
Etan Cohen
e74978c047 [CM] Remove non-functional timeout from request network am: e9aea9d397 am: a6be89aa40 
am: aae1411a93

Change-Id: I31fbce5bab0d03b9b468f4fc5e819a59027aca7b
 2017-02-16 14:37:26 +00:00
Etan Cohen
c3f0f5f3de Merge changes from topic 'cm_request_to' am: 6fb97e8fd8 
am: ede9f94e32

Change-Id: I2720e64e4af88df9d3a7b6209e9fcef4a0340986
 2017-02-16 14:29:29 +00:00
Etan Cohen
aae1411a93 [CM] Remove non-functional timeout from request network am: e9aea9d397 
am: a6be89aa40

Change-Id: Ie00ac8dee9302fafc0cdad95ec08d376ad908ab9
 2017-02-16 14:28:29 +00:00
Etan Cohen
ede9f94e32 Merge changes from topic 'cm_request_to' 
am: 6fb97e8fd8

Change-Id: I9ca18c0570be831ab37cdf200c28b0778117198d
 2017-02-16 14:23:18 +00:00
Etan Cohen
a6be89aa40 [CM] Remove non-functional timeout from request network 
am: e9aea9d397

Change-Id: Ica347b2c2181fe04a7efb2769d7498a31c888e5a
 2017-02-16 14:21:44 +00:00
Shreyas Basarge
0277db478d Better iteration over mCurrentOperations in cancelBackups 
handleCancel was being called on an operation
while we are iterating over all operations.
This can cause issues if handleCancel modifies
the array containing all operations.

Test: Run cancelBackup GTS tests.

Change-Id: If3fbe7b5d9e61aa870f8f6e0dd1654e735c0c5b8
 2017-02-16 14:16:14 +00:00
Etan Cohen
6fb97e8fd8 Merge changes from topic 'cm_request_to' 
* changes:
  [CM] Remove maximum timeout value for request network
  [CM] Remove non-functional timeout from request network
 2017-02-16 14:15:44 +00:00
Etan Cohen
ba07c8c4ec [CM] Remove maximum timeout value for request network 
The request network with timeout was originally created with a
check of max timeout against a constant of 100 minutes. However,
the API was not public and did not implement a timeout. Any users
were internal and never got any onUnavailable() callback (since
timeout never triggered).

There is no reason to have a max timeout so the constant is
remove.

Bug: 31399536
Test: unit tests and CTS of ConnectivityManager
Change-Id: Icbedfb4299d75b6a7e3e43720111531f1faafd06
 2017-02-16 14:15:16 +00:00
Jerome Gaillard
65febdd300 Merge "Fix LayoutlibTestCallback.getResourceId" 2017-02-16 13:31:38 +00:00
Jerome Gaillard
677f0d6c7c Merge "Update asm version in layoutlib following Change I2a6396e7" 2017-02-16 13:30:22 +00:00